Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Engineering lobby revision #19996

Merged

Conversation

FabianK3
Copy link
Contributor

@FabianK3 FabianK3 commented Oct 4, 2024

Introduction

This PR has the focus to revise the engineering lobby layout.
This is a revision to the first PR that has been closed to address different issues. (#19945).

What changed?

  • Updated engineering lobby layout and adjacent areas.
  • Added a notice board to the lobby.
  • Moved the engineering first aid locker into the lobby.

Preview

image
image
image

- New layout
- Add notice board
- Moved engineering FAK locker
@FabianK3 FabianK3 requested a review from DreamySkrell as a code owner October 4, 2024 14:47
@github-actions github-actions bot added the 🗺️ Mapping - Horizon The PR touches the Horizon map files. label Oct 4, 2024
@FabianK3
Copy link
Contributor Author

FabianK3 commented Oct 5, 2024

!review

Copy link

github-actions bot commented Oct 9, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Copy link
Contributor

@courierbravo courierbravo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Doors, buttons, etc all appear to be set correctly, along with relevant markers.

@NonQueueingMatt NonQueueingMatt added this pull request to the merge queue Oct 14, 2024
Merged via the queue into Aurorastation:master with commit 1e817a1 Oct 14, 2024
25 checks passed
@FabianK3 FabianK3 deleted the engineering-lobby-revision branch October 14, 2024 17:15
@FabianK3 FabianK3 restored the engineering-lobby-revision branch November 7, 2024 17:52
github-merge-queue bot pushed a commit that referenced this pull request Nov 7, 2024
This PR re-adds the engineering lobby of #19996 that has been overridden
with the merge of the BSD #20053.
Previous source branch has been restored.

Appendum:

- I'm considering the PR ready when the mapdiffbot shows no changes
outside the original engineering lobby and all checks are green, as the
original PR already got reviewed/merged.
- Marking it as bugfix for obvious reasons/transparency.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Awaiting Merge 🗺️ Mapping - Horizon The PR touches the Horizon map files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants